bitkeeper revision 1.1159.45.16 (412640acjI6W8MIoA2W2ArmKgPNJcA)

Fix bad migration interaction with /lib/tls emulation code.

diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
index 83fec948578c31be7429fc7460ff2b8518b49094..ff56d126310ad80c263c6428fe603c02eca12d12 100644 (file)
--- a/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/reboot.c
@@ -94,6 +94,13 @@ static void __do_suspend(void)
 
     HYPERVISOR_suspend(virt_to_machine(suspend_record) >> PAGE_SHIFT);
 
+    HYPERVISOR_vm_assist(VMASST_CMD_enable,
+                        VMASST_TYPE_4gb_segments);
+#ifdef CONFIG_XEN_WRITABLE_PAGETABLES
+    HYPERVISOR_vm_assist(VMASST_CMD_enable,
+                        VMASST_TYPE_writeable_pagetables);
+#endif
+
     shutting_down = -1; 
 
     memcpy(&start_info, &suspend_record->resume_info, sizeof(start_info));